From e89bd7dfa2aa8d2e1a30d07a1fedbbb9b10b0fae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Tue, 18 Sep 2018 16:29:10 +0200 Subject: [PATCH] menu: Remove useless if statement --- gtk/gtkmenu.c | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 37ce345089..97fb763a3b 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2503,6 +2503,7 @@ gtk_menu_size_allocate (GtkWidget *widget, gint x, y, i; gint width, height; GtkBorder arrow_border; + int base_width; g_return_if_fail (GTK_IS_MENU (widget)); g_return_if_fail (allocation != NULL); @@ -2559,48 +2560,45 @@ gtk_menu_size_allocate (GtkWidget *widget, if (gtk_widget_get_child_visible (priv->bottom_arrow_widget)) gtk_widget_size_allocate (priv->bottom_arrow_widget, &arrow_allocation, -1); - if (menu_shell->priv->children) + + base_width = width / gtk_menu_get_n_columns (menu); + children = menu_shell->priv->children; + while (children) { - gint base_width = width / gtk_menu_get_n_columns (menu); + child = children->data; + children = children->next; - children = menu_shell->priv->children; - while (children) + if (gtk_widget_get_visible (child)) { - child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child)) - { - gint l, r, t, b; + gint l, r, t, b; - get_effective_child_attach (child, &l, &r, &t, &b); + get_effective_child_attach (child, &l, &r, &t, &b); - if (gtk_widget_get_direction (GTK_WIDGET (menu)) == GTK_TEXT_DIR_RTL) - { - guint tmp; - tmp = gtk_menu_get_n_columns (menu) - l; - l = gtk_menu_get_n_columns (menu) - r; - r = tmp; - } + if (gtk_widget_get_direction (GTK_WIDGET (menu)) == GTK_TEXT_DIR_RTL) + { + guint tmp; + tmp = gtk_menu_get_n_columns (menu) - l; + l = gtk_menu_get_n_columns (menu) - r; + r = tmp; + } - child_allocation.width = (r - l) * base_width; - child_allocation.height = 0; - child_allocation.x = l * base_width; - child_allocation.y = - priv->scroll_offset; + child_allocation.width = (r - l) * base_width; + child_allocation.height = 0; + child_allocation.x = l * base_width; + child_allocation.y = - priv->scroll_offset; - for (i = 0; i < b; i++) - { - if (i < t) - child_allocation.y += priv->heights[i]; - else - child_allocation.height += priv->heights[i]; - } + for (i = 0; i < b; i++) + { + if (i < t) + child_allocation.y += priv->heights[i]; + else + child_allocation.height += priv->heights[i]; + } - gtk_menu_item_toggle_size_allocate (GTK_MENU_ITEM (child), - priv->toggle_size); + gtk_menu_item_toggle_size_allocate (GTK_MENU_ITEM (child), + priv->toggle_size); - gtk_widget_size_allocate (child, &child_allocation, -1); - } + gtk_widget_size_allocate (child, &child_allocation, -1); } } } -- 2.30.2